Add "clicked" signal back to columns.

Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
	Add "clicked" signal back to columns.

	* ChangeLog: remove conflict markers.

diff --git a/ChangeLog b/ChangeLog
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8508ed70a825b37b2340c9be08485437e0becd0e..fda6577955470e3b559a66f0eb67bf37d8fcf394 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Mar  6 17:25:07 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_clicked):
+       Add "clicked" signal back to columns.
+
+       * ChangeLog: remove conflict markers.
+
 Tue Mar  6 10:45:45 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkbutton.c: Add animation of activation by, on 
@@ -88,7 +95,6 @@ Mon Mar  5 14:38:54 2001  Jonathan Blandford  <jrb@redhat.com>
        parent_class pointer in pixbuf_style_class_init().
        (Will commit the fix to the pixbuf-engine too).
 
->>>>>>> 1.1779
 2001-03-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/gdkwindow.h:

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 0f88d5eed122cb6687f439d00257324a24e2ea30..5e0ed462dff828ac28b8bdd21f6be0ddeb175a3b 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -461,7 +461,11 @@ gtk_real_tree_column_clicked (GtkTreeViewColumn *tree_column)
 }
 
 
-
+static void
+gtk_tree_view_column_button_clicked (GtkWidget *widget, gpointer data)
+{
+  g_signal_emit_by_name (G_OBJECT (data), "clicked");
+}
 
 void
 _gtk_tree_view_column_create_button (GtkTreeViewColumn *column)
@@ -483,9 +487,9 @@ _gtk_tree_view_column_create_button (GtkTreeViewColumn *column)
   /* make sure we own a reference to it as well. */
   gtk_widget_set_parent (column->button, GTK_WIDGET (tree_view));
   
-  /*  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-      (GtkSignalFunc) gtk_tree_view_button_clicked,
-      (gpointer) tree_view);*/
+  gtk_signal_connect (GTK_OBJECT (column->button), "clicked",
+                     (GtkSignalFunc) gtk_tree_view_column_button_clicked,
+                     (gpointer) column);
 
   column->alignment = gtk_alignment_new (column->xalign, 0.5, 0.0, 0.0);